From 484a45c4b63b67fb524c033a1191e27f54782b86 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 1 Nov 2011 22:52:56 -0400
Subject: [PATCH] Drop DISABLE_DEPRECATED guards here, too

---
 modules/input/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 2ba9dcf99c..b847a19082 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -5,12 +5,10 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED 	\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_XIM_FLAGS)		\
 	$(GTK_DEP_CFLAGS)		\
@@ -153,7 +151,7 @@ endif
 endif
 
 multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
-im_multipress_la_CPPFLAGS = $(multipress_defs)
+im_multipress_la_CPPFLAGS = $(AM_CPPFLAGS) $(multipress_defs)
 libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
 im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_multipress_la_SOURCES =	\
-- 
2.30.2